diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index a3a5f3b..7e2eb46 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -17,10 +17,8 @@ include("xdmf.jl")
 include("abaqus_reader.jl")
 include("interfaces.jl")
 
-<<<<<<< HEAD
 export set_coordinates, get_coordinates #,  set_material
-=======
+
 #export set_coordinates, get_coordinates, set_material
->>>>>>> 18394347dd9874ca301e7612fc776ccab08f4601
 
 end # module