diff --git a/alfred/__init__.py b/alfred/__init__.py
index 7d41874..b9c4bb8 100644
--- a/alfred/__init__.py
+++ b/alfred/__init__.py
@@ -19,10 +19,6 @@
 from .vis import mod_change_statistics
 from .vis import find_replaced_modules
 from .vis import swapped_mod_dataframes
-<<<<<<< HEAD
-
-#from .analysis import
-=======
 from .vis import label_bad_module
 
 from .analysis import count_swapped_modules
@@ -35,4 +31,4 @@
 from .analysis import find_num_components
 from .analysis import perform_pca
 from .analysis import visualize_pca
->>>>>>> f9913cd96e5f2f48e85db6ef0e752c4285c534ef
+