diff --git a/automate.php b/automate.php
index 6e9ffff..2d6f4a4 100644
--- a/automate.php
+++ b/automate.php
@@ -75,6 +75,7 @@
 		// Creation de la requete
 		$requete    = new manager\ModuleRequest('firstModule/getUsers');
 
+<<<<<<< HEAD
 
 		var_dump( $requete->dispatch() );
 		// var_dump($requete->error);
@@ -107,6 +108,15 @@
 		return true;
 
 	}displayUsers();
+=======
+
+		var_dump( $requete->dispatch() );
+		// var_dump($requete->error);
+
+		return true;
+
+	}selectUsers();
+>>>>>>> f7462b406d4d1d347c4fcc87c7ae82e1b3053332