attempt to resolve merge conflict