diff --git a/src/abaqus_reader.jl b/src/abaqus_reader.jl
index 480bade..e02523a 100644
--- a/src/abaqus_reader.jl
+++ b/src/abaqus_reader.jl
@@ -1,9 +1,7 @@
-<<<<<<< HEAD
 # This file is a part of JuliaFEM. 
 # License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
 =======
 # This file is a part of JuliaFEM. License is MIT: https://github.com/ovainola/JuliaFEM/blob/master/README.md
->>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a
 module abaqus_reader
 
 using Logging