- resolve merge conflict