Resolve merge conflicts again