Merge "Change choosing strategy for docs merge to git-scm"