diff --git a/.travis.yml b/.travis.yml
index ec53b56..dabd365 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,10 @@ install:
 language: erlang
 script: ./rebar3 eunit
 otp_release:
-<<<<<<< HEAD
-=======
   - 20.2
   - 20.1
   - 20.0
   - 19.3
->>>>>>> dev
   - 19.2
   - 19.1
   - 19.0