diff --git a/.gitignore b/.gitignore
index 56a9d5d..7690d76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,10 +40,7 @@ composer.lock
 /app/phpunit.xml
 /phpunit.xml
 .phpunit.result.cache
-<<<<<<< HEAD
 test-report.xml
-=======
->>>>>>> add callback argument value resolver
 
 # Build data
 /build/