Fix conflicts for pull request