diff --git a/inventory.ini b/inventory.ini
index cef7df7..3342bce 100644
--- a/inventory.ini
+++ b/inventory.ini
@@ -1,9 +1,2 @@
-<<<<<<< HEAD
 [MeinePC]
 kickdev
-=======
-[VMs]
-kickdev.local ansible_host=192.168.2.189
-[Mein-PC]
-Philip-PC ansible_host=192.168.2.162
->>>>>>> pan/HEAD