diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
index a26f5c45d..4afc8c3d1 100644
--- a/exercises/modules/modules1.rs
+++ b/exercises/modules/modules1.rs
@@ -3,6 +3,10 @@
 // Execute `rustlings hint modules1` or use the `hint` watch subcommand for a
 // hint.
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 27d78e2 (edit modules1)
 mod sausage_factory {
     // Don't let anybody outside of this module see this!
     fn get_secret_recipe() -> String {