diff --git a/src/abaqus_reader.jl b/src/abaqus_reader.jl
index e02523a..6d89aa3 100644
--- a/src/abaqus_reader.jl
+++ b/src/abaqus_reader.jl
@@ -1,7 +1,6 @@
-# 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
+# This file is a part of JuliaFEM.
+# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
+
 module abaqus_reader
 
 using Logging
@@ -16,11 +15,6 @@ global handlers = Dict()
 @doc """
 Register new handler for parser
 """ ->
-=======
-"""
-Register new handler for parser
-"""
->>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a
 function add_handler(section, function_name)
   handlers[section] = function_name
 end
@@ -137,9 +131,5 @@ add_handler("NODE", parse_node_section)
 add_handler("ELEMENT", parse_element_section)
 add_handler("NSET", parse_nodeset_section)
 
+end
 
-<<<<<<< HEAD
-end
-=======
-end
->>>>>>> 3e48ae32abe7a17af89cd1e23d798532aed2960a
diff --git a/src/shape_functions.jl b/src/shape_functions.jl
index ef9b8f0..968f7f3 100644
--- a/src/shape_functions.jl
+++ b/src/shape_functions.jl
@@ -1,11 +1,6 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
 
-function test(a)
-     return a*2
-end
-
-
 function C2D4(xx)
      theta = 1
      chi = xx[1]
diff --git a/test/test_abaqus_reader.jl b/test/test_abaqus_reader.jl
index cf0f91e..4274e13 100644
--- a/test/test_abaqus_reader.jl
+++ b/test/test_abaqus_reader.jl
@@ -1,3 +1,6 @@
+# This file is a part of JuliaFEM.
+# License is MIT: see https://github.com/JuliaFEM/JuliaFEM.jl/blob/master/LICENSE.md
+
 using FactCheck
 using Logging
 @Logging.configure(level=INFO)
@@ -14,4 +17,4 @@ facts("test import abaqus model") do
     @fact length(model["nsets"]["SUPPORT"]) => 9
     @fact length(model["nsets"]["LOAD"]) => 9
     @fact length(model["nsets"]["TOP"]) => 83
-end
\ No newline at end of file
+end