diff --git a/.inscode b/.inscode
index 883df69487fe8e0611cca400a0d2c901530ef045..3b99d97697b03a51e4f2759faad2196f6ce16fc4 100644
--- a/.inscode
+++ b/.inscode
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 run = "upm add guess;npm run dev"
-=======
-run = "dist/index.html"
->>>>>>> 8e27e4d91d171fdca6522f4297ff30d0fdedccd0
 entrypoint = "index.ts"
 
 [nix]