Changes in project summary.
conflict resolution.