diff --git a/.travis.yml b/.travis.yml
index b0a9d7520..465d80f57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,24 +64,15 @@ script:
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "osx" ]; then make package; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./openmw_test_suite; fi
  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "${TRAVIS_OS_NAME}" = "linux" ]; then cd .. && ./CI/check_tabs.sh; fi
-<<<<<<< HEAD
 #notifications:
-#  recipients:
-#    - corrmage+travis-ci@gmail.com
 #  email:
+#    recipients:
+#      - corrmage+travis-ci@gmail.com
 #    on_success: change
 #    on_failure: always
-=======
-notifications:
-  email:
-    recipients:
-      - corrmage+travis-ci@gmail.com
-    on_success: change
-    on_failure: always
-  irc:
-    channels:
-      - "chat.freenode.net#openmw"
-    on_success: change
-    on_failure: always
-    use_notice: true
->>>>>>> refs/heads/pr/114
+#  irc:
+#    channels:
+#      - "chat.freenode.net#openmw"
+#    on_success: change
+#    on_failure: always
+#    use_notice: true