diff --git a/src/hydro/Gadget2/hydro_io.h b/src/hydro/Gadget2/hydro_io.h
index dab03600a8732258e31776296995202550b5f5ad..597c48c017314a5dea640cf5653d493b87bdab87 100644
--- a/src/hydro/Gadget2/hydro_io.h
+++ b/src/hydro/Gadget2/hydro_io.h
@@ -212,6 +212,5 @@ __attribute__((always_inline)) INLINE static void hydro_write_flavour(
 __attribute__((always_inline)) INLINE static int writeEntropyFlag(void) {
   return 0;
 }
->>>>>>> Check if all parameters in output_fields are correct
 
 #endif /* SWIFT_GADGET2_HYDRO_IO_H */