diff --git a/.travis.yml b/.travis.yml
index b2f604488..4aed11625 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,6 @@ php:
   - 5.6
   - hhvm
 
-<<<<<<< HEAD
-matrix:
-  allow_failures:
-    - php: hhvm
-    - php: 5.6
-
-=======
->>>>>>> master
 before_script:
     - sudo apt-get install parallel
     - rm -f ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
diff --git a/doc/03-cli.md b/doc/03-cli.md
index 044dac04f..700ebf7cc 100644
--- a/doc/03-cli.md
+++ b/doc/03-cli.md
@@ -144,15 +144,11 @@ php composer.phar update vendor/*
 * **--lock:** Only updates the lock file hash to suppress warning about the
   lock file being out of date.
 * **--with-dependencies** Add also all dependencies of whitelisted packages to the whitelist.
-<<<<<<< HEAD
-  So all packages with their dependencies are updated recursively.
 * **--disable-tls:** Display SSL/TLS peer verification.
 * **--cafile:** If specified, use the given certificate file for SSL/TLS peer verification.
-=======
 * **--prefer-stable:** Prefer stable versions of dependencies.
 * **--prefer-lowest:** Prefer lowest versions of dependencies. Useful for testing minimal
   versions of requirements, generally used with `--prefer-stable`.
->>>>>>> master
 
 ## require