diff --git a/lib/SLUB/LZA/SIPBuilderBagIt.pm b/lib/SLUB/LZA/SIPBuilderBagIt.pm
index 9d60d9bfec2deb546c621445d613374b4b0abee9..9cb62f7a7252f3b69509c8b8ffe153b71f228aab 100644
--- a/lib/SLUB/LZA/SIPBuilderBagIt.pm
+++ b/lib/SLUB/LZA/SIPBuilderBagIt.pm
@@ -134,10 +134,6 @@ sub get_marc21_from_catalogue($ppn){
             }
         }
     }
-<<<<<<< HEAD
-=======
-
->>>>>>> 5629056af64faa4dedc456d0e64e48a95d013134
     print_scalar_data( "INFO: Found metadata for PPN '$ppn'", "white");
     return $marc21;
 }