diff --git a/src/abaqus_reader.jl b/src/abaqus_reader.jl
index 749b6a9..480bade 100644
--- a/src/abaqus_reader.jl
+++ b/src/abaqus_reader.jl
@@ -14,7 +14,7 @@ VERSION < v"0.4-" && using Docile
 eldims = Dict("C3D10" => 10)
 global handlers = Dict()
 
-<<<<<<< HEAD
+
 @doc """
 Register new handler for parser
 """ ->