Fixes merge issues with pull request