Bad Merge one more time

src/ui/view/GUI.java

@@ -311,13 +311,9 @@ public class GUI implements CategoryListener {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
 					controller.addElementCanvasObject(tempCpsObject.getID(), addElementPopUp.getElement().getEleName(),
-<<<<<<< HEAD
 							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
 					refreshTableHolonElement();
 					refreshTableProperties();
-=======
-							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
->>>>>>> 0f43b0360afad6c157dc5a3e37fe5de97ec95f7f
 				}
 			}
 		});