id fix merges