Test git merge master