completed exercises
resolving pull conflicts
continuing box clicking games and exercises
resloving conflicts