updates to reflect merges