diff --git a/.travis.yml b/.travis.yml
index e6e701c7ec..7473b4736d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,32 +9,6 @@ env:
     - BYOND_MINOR="1418"
     - NODE_VERSION="4"
     - RUST_G_VERSION="0.3.0"
-<<<<<<< HEAD
-    - BUILD_TOOLS=false
-    - BUILD_TESTING=false
-    - DM_MAPFILE="loadallmaps"
-    matrix:
-    - BUILD_TOOLS=true
-    - BUILD_TESTING=true
-    - BUILD_TESTING=false
-
-cache:
-  directories:
-    - $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}
-    - tgui/node_modules
-
-
-addons:
-  apt:
-    packages:
-      - libc6-i386
-      - libgcc1:i386
-      - libstdc++6:i386
-      - gcc-multilib
-      - python3
-      - python3-pip
-      - libssl-dev:i386
-=======
 matrix:
   include:
     - env:
@@ -75,7 +49,6 @@ matrix:
           - $HOME/libmariadb
           - $HOME/.rustup
           - $HOME/.cargo
->>>>>>> a38ef37... Adds SQL to travis. Other travis optimizations (#38325)
 
 install:
   - tools/travis/install_build_tools.sh