diff --git a/conf/airframes/TUDelft/MicrojetBR.xml b/conf/airframes/TUDelft/MicrojetBR.xml
index bff4aafdcd..87465ccd46 100644
--- a/conf/airframes/TUDelft/MicrojetBR.xml
+++ b/conf/airframes/TUDelft/MicrojetBR.xml
@@ -1,10 +1,6 @@
 <!DOCTYPE airframe SYSTEM "../airframe.dtd">
 
-<<<<<<< HEAD
 <airframe name="Microjet BR Tiny 1.1">
-=======
-<airframe name="Microjet BDW Tiny 1.1">
->>>>>>> a4d3b4c95367a2e3ab2e21ebb81c7e7dc530d6ac
 
 <!-- commands section -->
   <servos>