git merge strategies from vish