Improve conflict theirs/ours aliases