Consolidated state, diff-n-merge