This pull request should lead to a merge conflict