diff --git a/.travis.yml b/.travis.yml
index 5f750ad..42d2799 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,7 @@ notifications:
 # uncomment the following lines to override the default test script
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia --check-bounds=yes -e 'Pkg.clone(pwd()); Pkg.build("JuliaFEM"); Pkg.test("JuliaFEM"; coverage=true)'
+  - julia --check-bounds=yes -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.build("JuliaFEM"); Pkg.test("JuliaFEM"; coverage=true)'
+after_success:
+  - julia -e 'cd(Pkg.dir("JuliaFEM")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+
diff --git a/src/JuliaFEM.jl b/src/JuliaFEM.jl
index e35e655..cc794e4 100644
--- a/src/JuliaFEM.jl
+++ b/src/JuliaFEM.jl
@@ -2,6 +2,7 @@
 module JuliaFEM
 
 # package code goes here
+<<<<<<< HEAD
 type Node
     node_id
     coords
@@ -9,6 +10,10 @@ end
 type Element
     element_id
     node_ids
+=======
+function test()
+    return 1
+>>>>>>> 449851216b54d7b731c51df489af594afed19821
 end
 
 end # module