school work completed
saving my current changes
conflict fixed