trying to resolve merge conflict