fix broken merge in exercises