diff --git a/.travis.yml b/.travis.yml
index 0aaec7c..26fe81d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ sudo: required
 language: c++
 matrix:
   include:
+<<<<<<< HEAD
     - env: {MATRIX_EVAL: "CC=gcc-7 && CXX=g++-7"}
       addons:
         apt:
@@ -23,6 +24,20 @@ matrix:
             - libxdo-dev
             - libinput-tools
             - g++-8
+=======
+    - addons: {apt: {packages: ["g++-8"]}}
+      env: {MATRIX_EVAL: "CC=gcc-7 && CXX=g++-7"}
+    - addons: {apt: {packages: ["g++-8"]}}
+      env: {MATRIX_EVAL: "CC=gcc-8 && CXX=g++-8"}
+addons:
+  apt:
+    update: true
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libxdo-dev
+      - libinput-tools
+>>>>>>> 535e1faf70916061ccf1d692fd6b747873538415
 before_install: eval "${MATRIX_EVAL}"
 install: bash install
 script: ./tests/run_tests