diff --git a/examples/rtic_bare5.rs b/examples/rtic_bare5.rs
index 1135230b601b2deb75259fdcfe86214c7fe4ac8c..de6409d5aa555f891f122e509e4129fb07a16c64 100644
--- a/examples/rtic_bare5.rs
+++ b/examples/rtic_bare5.rs
@@ -181,6 +181,10 @@ const APP: () = {
         gpioa.MODER.write(r | 0b01 << (5 * 2)); // set output mode
 
         // test_modify();
+<<<<<<< HEAD
+=======
+        test_modify();
+>>>>>>> 4897099 (Did my best)
 
 
         loop {
@@ -204,6 +208,10 @@ const APP: () = {
     }
 };
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4897099 (Did my best)
 // 1. C like API.
 //    Using C the .h files are used for defining interfaces, like function signatures (prototypes),
 //    structs and macros (but usually not the functions themselves).
@@ -245,6 +253,10 @@ const APP: () = {
 //    What if we could automatically generate that from Vendors specifications (SVD files)?
 //    Wouldn't that be great?
 //
+<<<<<<< HEAD
 //    ** your answer here **
+=======
+//    I got the first assert to work. But I don't understand the second. What are we supposed to do?
+>>>>>>> 4897099 (Did my best)
 //
 //    Commit your answers (bare5_2)