diff --git a/ARK/game.params.ori b/ARK/game.params.ori
index 5d00880..7a09434 100644
--- a/ARK/game.params.ori
+++ b/ARK/game.params.ori
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-GAME_STEAMID=376030
-GAME_PATH=~/jeux/server_${GAME_NAME}
-LOG_PATH=~/logs/${GAME_NAME}
-GAME_BIN=${GAME_PATH}/ShooterGame/Binaries/Linux/ShooterGameServer
-SERVER_NAME=PATATE_Onimaro
-#GAME_PORT will be the specified port and the following (here 7779 and 7780)
-GAME_PORT=7779
-#QUERY_PORT is the port used by steam to connect players to your server
-QUERY_PORT=27015
-GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log -noBattlEye"
-=======
 export GAME_STEAMID=376030
 export GAME_PATH=~/jeux/server_${GAME_NAME}
 export LOG_PATH=~/logs/${GAME_NAME}
@@ -20,4 +8,3 @@ export GAME_PORT=7779
 export #QUERY_PORT is the port used by steam to connect players to your server
 export QUERY_PORT=27015
 export GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log"
->>>>>>> 4f0f0b6cb15091e3cb2eeba5038af48f1798b31b