Adding git merge strategies