Fixed Merge Conflicts

src/SingleTile.java

@@ -16,6 +16,6 @@ public class SingleTile extends Tile {
         this.tileImage = tileImage;
     }
     public void draw(Graphics g){
-        g.drawImage(tileImage, x, y, length, length, null);
+        g.drawImage(tileImage, x-GamePanel.camera.x, y, length, length, null);
     }
 }