Strange post-merge issue