Tutorial 7 -- Quick fixes to merged code