diff --git a/.travis.yml b/.travis.yml
index 68e49b6..d126eee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 language: ruby
 rvm:
   - 2.2.2
@@ -14,20 +13,3 @@
 script:
   - bundle exec rake db:test:prepare
   - bundle exec rake
-=======
-language: ruby
-rvm:
-  - 2.1.10
-
-services:
-  - mysql
-
-before_script:
-  - cp config/database_example.yml config/database.yml
-  - cp config/secrets_example.yml config/secrets.yml
-  - mysql -e 'create database IF NOT EXISTS roadmap_test;' -uroot
-
-script:
-  - bundle exec rake db:test:prepare
-  - bundle exec rake
->>>>>>> 8fe77923f8665849a4381acb35648bce07c723fe