Correct Merge

src/ui/view/GUI.java

@@ -310,15 +310,9 @@ public class GUI implements CategoryListener {
 						&& tempCpsObject.getID() != 0) {
 					addElementPopUp = new AddElementPopUp();
 					addElementPopUp.setVisible(true);
-<<<<<<< HEAD
 					controller.addElementCanvasObject(tempCpsObject.getID(), addElementPopUp.getElement().getEleName(),
 							addElementPopUp.getElement().getAmount(), addElementPopUp.getElement().getEnergy());
-=======
-					controller.addElementCanvasObject(tempCpsObject.getID(),
-							addElementPopUp.getElement().getEleName(), addElementPopUp.getElement().getAmount(),
-							addElementPopUp.getElement().getEnergy());
 					refreshTableHolonElement();
->>>>>>> e4dd5230480ec56a5237cc665a0168f4a8b095d8
 				}
 			}
 		});
@@ -801,7 +795,7 @@ public class GUI implements CategoryListener {
 			return null;
 		}
 	}
-	
+
 	/*
 	 * Refresh the Table displaying the Holon Elements
 	 */