diff --git a/cicaprojekt/Tester.java b/cicaprojekt/Tester.java
index ba61af8..8586feb 100644
--- a/cicaprojekt/Tester.java
+++ b/cicaprojekt/Tester.java
@@ -100,6 +100,7 @@ public class Tester {
     }
 
     @Test
+<<<<<<< 68c0dd96e3304b4048de58acf99e10ab3da9abd5
     boolean extraZPM(){
         String[] commands = {"loadMap testExtraZPMs\n",
                 "listZPMs\n",
@@ -111,4 +112,23 @@ public class Tester {
 
         return testOnSequenceOfCommands(commands, expectedOutputs);
     }
+=======
+    boolean testScalesAndGates(){
+        String[] commands = {"loadMap testScalesAndGates\n",
+                             "boxLift O\n",
+                             "rotate O L\n",
+                             "boxDrop O\n"};
+        
+        String[] expectedOutputs = {"door open"};
+        boolean results = testOnSequenceOfCommands(commands, expectedOutputs);
+        
+        System.out.print("testScalesAndGates: ");
+        if(results)
+            System.out.println("Sikeres!");
+        else System.out.println("Sikertelen!");
+        
+        return results;
+    }
+    
+>>>>>>> boolean testScalesAndGates() added to Tester
 }