diff --git a/.gitignore b/.gitignore
index 6019d1b..45e95ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
 magellan
 emulator/rf-emulator
 **/*.db
-<<<<<<< HEAD
 **.tar.gz
 **.tar.zst
 **.part
-=======
 dist/*
 **coverage.out**
->>>>>>> 4b062dd (Updated .gitignore)