making change that should cause merge issue