diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index cc794e4..3c257cf 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -2,7 +2,6 @@
 module JuliaFEM
 
 # package code goes here
-<<<<<<< HEAD
 type Node
     node_id
     coords
@@ -10,10 +9,9 @@ end
 type Element
     element_id
     node_ids
-=======
+
 function test()
     return 1
->>>>>>> 449851216b54d7b731c51df489af594afed19821
 end
 
 end # module