diff --git a/.gitignore b/.gitignore
index 8978beeaf..ab879e79a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .dbeaver/*
 .project
->>>>>>> refs/remotes/origin/improve-apollo-logging
 *.log
 /node_modules/*
 messages.pot