diff --git a/src/data/Data.jl b/src/data/Data.jl
index 940b7ea7..16a025a7 100644
--- a/src/data/Data.jl
+++ b/src/data/Data.jl
@@ -48,11 +48,7 @@ using .Sentiment
 include("iris.jl")
 export Iris
 
-<<<<<<< HEAD
 include("housing.jl")
 export Housing
 
 end
-=======
-end #module
->>>>>>> af20a785... add DataLoader