31+ How to resolve merge conflicts in git design