HW9: Post HW7 merge issues