Exercises
fixed merge conflict