merge fix

src/ui/controller/Control.java

@@ -95,11 +95,7 @@ public class Control {
 		objectController.deleteElementInCanvas(id, element);
 	}
 
-<<<<<<< HEAD
-	public CpsObject searchByID(int ID) {
-=======
 	public CpsObject searchByID(int ID){
->>>>>>> 9d32e63f53c4e733d9fe9afe6c64c2dd90d87428
 		return objectController.searchByID(ID);
 	}