Attempting my first git merge...