diff --git a/install/desktop/app-vscode.sh b/install/desktop/app-vscode.sh
index 447fd84f..828b13c9 100644
--- a/install/desktop/app-vscode.sh
+++ b/install/desktop/app-vscode.sh
@@ -1,5 +1,4 @@
 cd /tmp
-<<<<<<< HEAD
 
 if [[ -z $UTILS_SOURCED ]]; then
     source ~/.local/share/omakub/utils.sh
@@ -34,5 +33,4 @@ elif wget -O code.deb "https://code.visualstudio.com/sha/download?build=stable&o
 else
     cd -
     false
-fi
-
+fi
\ No newline at end of file