diff --git a/.travis.yml b/.travis.yml
index 35bc85f..31b655e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,21 +29,10 @@ script:
   - git clone https://github.com/JuliaRegistries/General  $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "General"))')  
   - git clone https://github.com/JuliaPOMDP/Registry  $(julia -e 'import Pkg; println(joinpath(Pkg.depots1(), "registries", "JuliaPOMDP"))')  
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-<<<<<<< HEAD
-  - julia --project --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sisl/Vec.jl")); Pkg.add(PackageSpec(url="https://github.com/sisl/Records.jl"));'
-  - julia --project --check-bounds=yes -e 'using Pkg; Pkg.add(PackageSpec(url="https://github.com/sisl/AutomotiveDrivingModels.jl"));  Pkg.add(PackageSpec(url="https://github.com/sisl/AutoViz.jl"));  Pkg.add(PackageSpec(url="https://github.com/JuliaPOMDP/RLInterface.jl")); '
-  - julia --project --check-bounds=yes -e 'Pkg.build("AutomotivePOMDPs"); Pkg.test("AutomotivePOMDPs"; coverage=true)'
-
+  - julia --project --color=yes -e 'import Pkg; Pkg.build(); Pkg.test(coverage=true)'
 after_success:
   - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
   - julia --project -e 'import Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-=======
-  - julia --project --color=yes -e 'import Pkg; Pkg.build(); Pkg.test(coverage=true)'
-after_success:
-  # push coverage results to Coveralls
-  - julia -e 'cd(Pkg.dir("AutomotivePOMDPs")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
-  # push coverage results to Codecov
-  - julia -e 'cd(Pkg.dir("AutomotivePOMDPs")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
 jobs:
   include:
     - stage: "Documentation"
@@ -66,4 +55,3 @@ jobs:
                                 Pkg.instantiate()'
         - julia --project=docs/ docs/make.jl
       after_success: skip
->>>>>>> 09f2341a53620aaa0158b668569c2164cb6f684d