diff --git a/Staff.java b/Staff.java
index 1cf7228d25a0e0ecea1accb6eadfaa900d3535fe..442d194e26041144c87d783d34aac57030f259cf 100644
--- a/Staff.java
+++ b/Staff.java
@@ -539,8 +539,6 @@ public class Staff {
         );
     }
 
-<<<<<<< Staff.java
-
     public Employee tly6() {
             return new Employee(
                 "Truong",
@@ -551,7 +549,6 @@ public class Staff {
          );
     }
 
-=======
     public Employee ccsekhar20() {
 	    return new Employee(
 		"Chaitanya",