Don't try a merge if type changes, just take the new version