Given the conflicts posted above, I think using the “git merge 2.1.0 --strategy-option theirs” command is the best approach.