diff --git a/examples/rtic_bare2.rs b/examples/rtic_bare2.rs
index fcc408f02b2ec1a1b024bb4cb77f7a8d578d0afc..7ed17fc3f67ff77df042cb526f8e63b932712d16 100644
--- a/examples/rtic_bare2.rs
+++ b/examples/rtic_bare2.rs
@@ -155,10 +155,14 @@ End of assembler dump.
 //
 //    Answer in your own words, why you believe the generated code differs?
 //
+<<<<<<< HEAD
 /*
 To save space the compiler makes some optimizations in the code.
 So wait is now compiled as a function and takes an argument in r0 instead of 
 just setting a value before it runs.
 */
+=======
+//      It starts the wait function where it just loops nops.
+>>>>>>> a08f880 (bare1-3 done)
 //
 //    Commit your answers (bare2_3)