#7 proj1 merge