diff --git a/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb_v2.py b/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb_v2.py
index ff18d74d19..dc5fce60d3 100644
--- a/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb_v2.py
+++ b/pythonExamples/Aug2015DataSourceTutorial/FindContactsDb_v2.py
@@ -101,19 +101,11 @@ class ContactsDbIngestModule(DataSourceIngestModule):
         self.context = context
 
     # Where the analysis is done.
-<<<<<<< HEAD
-    # The 'data_source' object being passed in is of type org.sleuthkit.datamodel.Content.
-    # See: http://www.sleuthkit.org/sleuthkit/docs/jni-docs/4.6.0/interfaceorg_1_1sleuthkit_1_1datamodel_1_1_content.html
-    # 'progress_bar' is of type org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress
-    # See: http://sleuthkit.org/autopsy/docs/api-docs/4.6.0/classorg_1_1sleuthkit_1_1autopsy_1_1ingest_1_1_data_source_ingest_module_progress.html
-    def process(self, data_source, progress_bar):
-=======
     # The 'dataSource' object being passed in is of type org.sleuthkit.datamodel.Content.
     # See: http://www.sleuthkit.org/sleuthkit/docs/jni-docs/latest/interfaceorg_1_1sleuthkit_1_1datamodel_1_1_content.html
     # 'progressBar' is of type org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress
     # See: http://sleuthkit.org/autopsy/docs/api-docs/latest/classorg_1_1sleuthkit_1_1autopsy_1_1ingest_1_1_data_source_ingest_module_progress.html
     def process(self, dataSource, progressBar):
->>>>>>> db1553ba4e186f1fe50e706a18113f6539779cee
 
         # we don't know how much work there is yet
         progress_bar.switchToIndeterminate()