adding in tests for git merge. Closes #6