removed assignment 2 because of a MERGE CONFLICT that i should not have had