diff --git a/appveyor.yml b/appveyor.yml
index 6f3022a..c897d18 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -21,15 +21,10 @@ install:
   - IF NOT EXIST C:\tools\php (cinst -y php)
   - echo extension_dir=ext > C:\tools\php\php.ini
   - echo extension=php_openssl.dll >> C:\tools\php\php.ini
-<<<<<<< HEAD
-  # install composer
-  - IF NOT EXIST vendor (php -r "readfile('https://getcomposer.org/installer');" | php & php composer.phar --prefer-source install)
-=======
   - echo extension=php_mbstring.dll >> C:\tools\php\php.ini
   # install composer
   - IF NOT EXIST vendor (php -r "readfile('https://getcomposer.org/installer');" | php & php composer.phar --prefer-source install)
   - tests\convert_symlinks_to_windows_style.sh
->>>>>>> GinoPane-master
 
 test_script:
   - vendor\bin\phpunit