Use patience algorithm while git merge