resolve merge conflict