diff --git a/.travis.yml b/.travis.yml
index 69e588ce89..a5ce748eb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,20 +8,6 @@ python:
 services:
   - mysql
  
-before_script:
-  - mysql -u root -ptravis -e 'CREATE DATABASE test_frappe'
-  - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
-  - echo "USE mysql;\nGRANT ALL PRIVILEGES ON \`test_frappe\`.* TO 'test_frappe'@'localhost';\n" | mysql -u root -ptravis
-
-  - cd ~/frappe-bench
-  - bench use test_site
-  - bench reinstall --yes
-  - bench setup-help
-  - bench scheduler disable
-  - sed -i 's/9000/9001/g' sites/common_site_config.json
-  - bench start &
-  - sleep 20
-
 install:
   - sudo rm /etc/apt/sources.list.d/mongodb*.list
   - sudo rm /etc/apt/sources.list.d/docker.list
@@ -38,8 +24,6 @@ install:
   - cd ~/ && bench init frappe-bench --python $(which python) --frappe-path $TRAVIS_BUILD_DIR
   - cp -r $TRAVIS_BUILD_DIR/test_sites/test_site ~/frappe-bench/sites/
 
-<<<<<<< HEAD
-=======
 before_script:
   - mysql -u root -ptravis -e 'create database test_frappe'
   - echo "USE mysql;\nCREATE USER 'test_frappe'@'localhost' IDENTIFIED BY 'test_frappe';\nFLUSH PRIVILEGES;\n" | mysql -u root -ptravis
@@ -56,6 +40,5 @@ before_script:
   - bench start &
   - sleep 10
 
->>>>>>> master
 script:
   - bench run-tests