Weird Code out!

src/ui/view/MyCanvas.java

@@ -111,12 +111,10 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 							cps.getPosition().y + controller.getScaleDiv2(),
 							con.getPosition().x + controller.getScaleDiv2(),
 							con.getPosition().y + controller.getScaleDiv2());
-<<<<<<< .merge_file_5vsGyG
 				g2.drawString("Capacity", (cps.getPosition().x + con.getPosition().x) / 2 + model.getScaleDiv2(),
 						(cps.getPosition().y + con.getPosition().y) / 2 + model.getScaleDiv2());
-=======
-				g2.drawString("100", (cps.getPosition().x+con.getPosition().x)/2+model.getScaleDiv2(), (cps.getPosition().y+con.getPosition().y)/2+model.getScaleDiv2());
->>>>>>> .merge_file_XQl6Qh
+				g2.drawString("100", (cps.getPosition().x + con.getPosition().x) / 2 + model.getScaleDiv2(),
+						(cps.getPosition().y + con.getPosition().y) / 2 + model.getScaleDiv2());
 			}
 		}
 
@@ -132,8 +130,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			}
 		}
 
-		
-		
 		// Objects
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
@@ -183,17 +179,15 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				// If drawing an Edge (CTRL down)
 				if (e.isControlDown()) {
 					drawEdge = true;
-<<<<<<< .merge_file_5vsGyG
-					controller.deleteElementCanvas(1, "Rehab");
-					System.out.println(((HolonObject) model.getCategories().get(0).getObjects().get(0)).getElements()
-							.get(2).getAmount());
-=======
-					/*
 					controller.deleteElementCanvas(1, "Rehab");
 					System.out.println(((HolonObject) model.getCategories().get(0).getObjects().get(0)).getElements()
 							.get(2).getAmount());
-					*/
->>>>>>> .merge_file_XQl6Qh
+					/*
+					 * controller.deleteElementCanvas(1, "Rehab");
+					 * System.out.println(((HolonObject)
+					 * model.getCategories().get(0).getObjects().get(0)).
+					 * getElements() .get(2).getAmount());
+					 */
 				}
 				if (tempCps.getClass() == HolonObject.class) {
 					HolonObject tempObj = ((HolonObject) tempCps);