fixed 1 again

examples/rtic_bare2.rs

@@ -155,14 +155,15 @@ 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)
+/*
+It starts the wait function where it just loops nops for a certain number of times that fits the wait value. Each time it will remove 1 from r0 and check if it resulted in a negative number or not. If it results in a negative number it will not branch and the wait is over. So if you insert 100 it will probably divide 100 on 8 and then insert the nearest hole number of that in to r0.
+*/
+
 //
 //    Commit your answers (bare2_3)