diff --git a/.travis.yml b/.travis.yml
index b3fa2728..b15c9fbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 sudo: false
 script: test/run
 language: c
+<<<<<<< HEAD
 os:
   - linux
   - osx