pull request to resolve merge issue