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