For conflict
After resolution of conflict