Start of HW 7
resolved conflit