Trying to fix merge conflict with pull request