diff --git a/package/etc/context/splunk_index.csv b/package/etc/context/splunk_index.csv
index 4446970..97cf982 100644
--- a/package/etc/context/splunk_index.csv
+++ b/package/etc/context/splunk_index.csv
@@ -2,7 +2,6 @@ cisco:asa,index,main
 cisco:asa,sourcetype,cisco:asa
 cisco:ios,index,main
 cisco:ios,sourcetype,cisco:ios
-<<<<<<< HEAD
 fgt_event,sourcetype,fgt_event
 fgt_event,index,main
 fgt_log,sourcetype,fgt_log
@@ -11,8 +10,6 @@ fgt_traffic,sourcetype,fgt_traffic
 fgt_traffic,index,main
 fgt_utm,sourcetype,fgt_utm
 fgt_utm,index,main
-=======
->>>>>>> master
 pan:traffic,index,main
 pan:threat,index,main
 pan:system,index,main