diff --git a/ahoskingit/config.yaml b/ahoskingit/config.yaml
index 57897df..095cc94 100644
--- a/ahoskingit/config.yaml
+++ b/ahoskingit/config.yaml
@@ -1,14 +1,8 @@
 ---
 vagrants:
   "ubuntu/trusty64": "ubuntu/trusty64"
-<<<<<<< HEAD
   "ubuntu/xenial64": "ubuntu/xenial64"
   "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
-
-=======
-  "boxcutter/ubuntu1604": "boxcutter/ubuntu1604"
- 
->>>>>>> dfcfe37cf523476c0bd27c2a0d6e75ab9189654d
 hosts:
     docker: 10.200.200.20
     nextcloud: 10.200.200.2