diff --git a/familyark/app/entrypoint.sh b/familyark/app/entrypoint.sh
index bdad1e4..1201d0a 100644
--- a/familyark/app/entrypoint.sh
+++ b/familyark/app/entrypoint.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-<<<<<<< HEAD
 npm i --unsafe-perm
-=======
->>>>>>> d64f7d2a7f505b161de3c0ef05fc9e74e59d978c
 yarn
 node server