preparing to merge
coflicts resolved
prediction-based surprise working
making adjustents to deliberation