Completed assignment version 1
Merging