Story 1573: Front page rework.
Remote pull conflict resolution.