resolve merge conflicts using checkout --ours