diff --git a/package.json b/package.json
index 395b4d16..0f88bb48 100644
--- a/package.json
+++ b/package.json
@@ -1,22 +1,8 @@
 {
   "private": true,
   "scripts": {
-<<<<<<< HEAD
     "dev": "vite",
     "build": "vite build"
-=======
-    "dev": "npm run development",
-    "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "watch": "npm run development -- --watch",
-    "watch-poll": "npm run watch -- --watch-poll",
-    "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "prod": "npm run production",
-    "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "bundleup": "webpack-cli"
-<<<<<<< HEAD
-=======
->>>>>>> 3aeb0bb3 (work on documentation)
->>>>>>> cdfdbf0cb00f89667a3ee8dc10876072bea61b2d
   },
   "devDependencies": {
     "axios": "^1.3.5",
diff --git a/resources/css/mapping.css b/resources/css/mapping.css
index 2115e646..0c6419b5 100644
--- a/resources/css/mapping.css
+++ b/resources/css/mapping.css
@@ -191,5 +191,5 @@ footer {
     height: 20px;
     color: #000000;
     display: block;
-    cursor: pointer !important;
+    cursor: pointer;
 }
diff --git a/resources/views/admin/mapping.blade.php b/resources/views/admin/mapping.blade.php
index c6a25400..00523f45 100644
--- a/resources/views/admin/mapping.blade.php
+++ b/resources/views/admin/mapping.blade.php
@@ -72,7 +72,7 @@ class="fas fa-square"
                             <i id="tag" class="mapping-icon fas fa-rotate-left"></i>
                             <i id="tag" class="mapping-icon fas fa-rotate-right"></i>
                             --
-                            <i id="tag" class="mapping-icon fas fa-pencil"></i>
+                            <i id="font-btn" class="mapping-icon fas fa-font"></i>
                             <i id="tag" class="mapping-icon fas fa-palette"></i>
                             ---
                             <i id="group-btn" class="mapping-icon fas fa-object-group"></i>
@@ -106,7 +106,7 @@ class="fas fa-square"
                             <button id="apply-edge-style">Appliquer</button>
                         </div>
 
-                      <div id="graph-container" style="flex: 1; background: #fff;"></div>
+                    <div id="graph-container" style="position: relative; overflow: hidden; width: 800px; height: 600px; cursor: default; touch-action: none;">
                     </div>
                 </div>
             </div>