diff --git a/cicaprojekt/Tester.java b/cicaprojekt/Tester.java
index 324cd71..e102542 100644
--- a/cicaprojekt/Tester.java
+++ b/cicaprojekt/Tester.java
@@ -198,11 +198,7 @@ public class Tester {
 
     @Test
     boolean testScalesAndGates() throws IOException {
-<<<<<<< HEAD
-        boolean succes = true;
-=======
         boolean success = true;
->>>>>>> cica
         
         loadMap("testScalesAndGates");
         boxLift("O");
@@ -212,11 +208,7 @@ public class Tester {
         String gateOpen = getConnectedGateOpen((Scale)oneill.getCurrentTile().getAdjacentTile(oneill.facingDirection));
         
         if(!gateOpen.equals("gate open"))
-<<<<<<< HEAD
-            succes = false;
-=======
             success = false;
->>>>>>> cica
         
         System.out.print("testScalesAndGates: ");
         if(success)
@@ -291,15 +283,7 @@ public class Tester {
 
         return results;  
     }
-<<<<<<< HEAD
 
-    @Test
-    boolean rotationTest() {
-        String[] commands = {"loadMap rotationTest\n",
-                "Rotate O L\n",
-                "Rotate O R\n"};
-=======
->>>>>>> cica
 
     @Test
     boolean rotationTest() throws IOException {
@@ -314,32 +298,10 @@ public class Tester {
             success = false;
         
         System.out.print("rotationTest: ");
-<<<<<<< HEAD
-
-        return true; //TODO check this
-    }
-
-    @Test
-    boolean testBoxes(){
-        boolean succes = true;
-
-        if(!boxLift("O").equals("box lifted"))
-            succes = false;
-        
-        if(!boxDrop("O").equals("box dropped"))
-            succes = false;
-
-        System.out.print("testBoxes: ");
-        if(succes)
-            System.out.println("Sikeres!");
-        else System.out.println("Sikertelen!");
-
-        return succes;
-=======
         if(success)
             System.out.println("Sikeres!");
         else System.out.println("Sikertelen!");
-        
+
         return success;
     }
 
@@ -359,12 +321,11 @@ public class Tester {
         if(success)
             System.out.println("Sikeres!");
         else System.out.println("Sikertelen!");
-
+        
         return success;
->>>>>>> cica
     }
 
     private boolean testOnSequenceOfCommands(String[] commands, String[] expectedOutputs) {
         return true;
     }
-}
+}
\ No newline at end of file