moved git merge to functions