init merge commit assignment 3