Weird Code deleted

src/ui/controller/Control.java

@@ -91,16 +91,10 @@ public class Control {
 		objectController.addNewElementIntoCategoryObject(catName, objName, eleName, amount, energy);
 	}
 
-<<<<<<< HEAD
 	public void deleteElement() {
 
-=======
-	public void deleteElement(){
-		
->>>>>>> 23fbd1311595765cdebdde88b8482bc96d187ca3
 	}
 
-
 	////////// etc
 	/**
 	 * Getter for Model