diff --git a/FreeBSD/vm/vcreate.csh b/FreeBSD/vm/vcreate.csh
index 42411b5..b95c31c 100644
--- a/FreeBSD/vm/vcreate.csh
+++ b/FreeBSD/vm/vcreate.csh
@@ -16,10 +16,7 @@ set IMAGE=ubuntu20.img
 set PUBKEY=/home/simon/.ssh/id_ed25519.pub
 set NAMESERVER=192.168.10.254
 set GATEWAY=192.168.10.254
-<<<<<<< HEAD
-=======
 set PREFIX=24
->>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
 
 # create vm
 $VM create \
@@ -27,9 +24,5 @@ $VM create \
   -s $SIZE \
   -i $IMAGE \
   -C -k $PUBKEY \
-<<<<<<< HEAD
-  -n "ip=$IP/24;gateway=$GATEWAY;nameservers=$NAMESERVER" \
-=======
   -n "ip=$IP/$PREFIX;gateway=$GATEWAY;nameservers=$NAMESERVER" \
->>>>>>> 93e0bfb4f86673a87465d127972c447d7c48cfc0
   $HOSTNAME