Test conflict merge for pull request 23