fix merges with ids