diff --git a/.gitignore b/.gitignore
index 302fe5578..71bc3b594 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 .dbeaver/*
 =======
 .dbeaver