diff --git a/src/backend/Simulator.java b/src/backend/Simulator.java
index 8dba7b3..aed4919 100644
--- a/src/backend/Simulator.java
+++ b/src/backend/Simulator.java
@@ -50,9 +50,9 @@ public class Simulator extends Thread {
 
 
 		//Default rule : Survive always, birth never
-		//for(int i =0; i<9; i++) {
-		//	fieldSurviveValues.add(i);
-		//}
+		for(int i =0; i<9; i++) {
+			fieldSurviveValues.add(i);
+		}
 
 	}
 
@@ -63,24 +63,7 @@ public class Simulator extends Thread {
 	public int getHeight() {
 		return LINE_NUM;
 	}
-<<<<<<< HEAD
 
-=======
-	
-	public World getWorld(){
-		return world;
-	}
-	
-	public int getCell(int x, int y) {
-		return world.getCell(x, y);
-	}
-	
-	public void setWorld(World world) {
-		this.world = world;
-	}
-	
-	
->>>>>>> branch 'master' of https://gitarero.ecam.fr/laure.bel/OOP_F3_Project.git
 	//Should probably stay as is
 	public void run() {
 		stepCount=0;