diff --git a/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json b/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json
index d75ebe7ce7cf87bc0ad9c612f0928c14ab4fc111..818799b3a0aa34a420d32bd867e9648634405fc8 100644
--- a/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json	
+++ b/json/v7.x vis/filebeat v7.1/elk-hole - vis_enhanced.json	
@@ -323,8 +323,4 @@
     },
     "_references": []
   }
-<<<<<<< HEAD
 ]
-=======
-]
->>>>>>> 3527227e4fc49b9323cb01c5f261b39b07553b11