diff --git a/.gitignore b/.gitignore
index ea7124b..a4c5457 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
 *.d
 *.o
 Release/*
-!Release/RepRapFirmware*.bin
 *~
 *orig
-<<<<<<< HEAD
-/Release
-=======
->>>>>>> duet
-