making change that should cause merge issue

I'm assuming that user erikweibust will be notified about this request.