Change done exclusively to generate a merge conflict
Fixed merge conflict with conflict-branch