diff --git a/src/ba/f9.dir b/src/ba/f9.dir
index 6e92437eb..c28ba8cf0 100755
--- a/src/ba/f9.dir
+++ b/src/ba/f9.dir
@@ -1,7 +1,3 @@
 9
 1
-<<<<<<< HEAD
-%nditte|0|0|652|0|Ditte|||
-=======
 %nditte|0|0|754|0|Ditte|||
->>>>>>> 0cadcd6dee4a4a67021c26174d7dea2a761fe182