diff --git a/index.php b/index.php
index c5217be..7c13a02 100644
--- a/index.php
+++ b/index.php
@@ -11,12 +11,7 @@ require_once __DIR__ . '/config/config.php';
 
 require __DIR__ . '/vendor/autoload.php';
 
-
-<<<<<<< HEAD
 $co = new \Gateway\Connection('pgsql:host=localhost;dbname=dbkekentin;', 'kekentin', '');
-=======
-//$co = new \Gateway\Connection('pgsql:host=localhost;dbname=dbkekentin;', 'kekentin', 'Chocolat-77');
->>>>>>> c15b8ac10f284e05dcb48f381a22751be4dd20a9
 
 //twig
 $loader = new \Twig\Loader\FilesystemLoader('vue/templates');