Fixed staff issue.

Staff.java

@@ -693,7 +693,6 @@ public class Staff {
         );
     }
 
-<<<<<<< HEAD
     public Employee sjeyte() {
 	    return new Employee(
 		"Sulyman",
@@ -704,7 +703,6 @@ public class Staff {
 	);
     }
     
-=======
      public Employee ggsmadhu(){
     	    return new Employee(
 		"Madhumitha",
@@ -772,6 +770,5 @@ public class Staff {
 		"Hello Kitty"
 	);
     }
->>>>>>> origin/main
 }