- resolve merge conflicts