diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index 212a1c7..9cef628 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -268,9 +268,7 @@ public class Simulator extends Thread {
 	
 	public void setLoopDelay(int delay) {
 		//TODO : complete method
-<<<<<<< HEAD
 		loopDelay=delay;
-=======
 //		this.loopDelay = delay;
 //		if (pauseFlag) {
 //	        return;
@@ -282,7 +280,6 @@ public class Simulator extends Thread {
 //	        Thread.currentThread().interrupt(); // Restore interrupted status.
 //	        System.err.println("Simulation step was interrupted.");
 //	    }
->>>>>>> branch 'master' of https://gitarero.ecam.fr/raphael.savio/OOP_E4_Project.git
 	}
 	
 	public void toggleClickAction() {