Screenshot: Work Cycle: Resolve conflicts