completed exercises
resolving pull conflicts