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