Merge mischief