diff --git a/.gitignore b/.gitignore
index 7ff1e202d..f1a8e9157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-.dbeaver/*
+/.dbeaver/*
 .project
-=======
->>>>>>> refs/remotes/origin/master
 *.log
 *.bak
 /node_modules/*