Trying to resolve merge conflict