conflict resolve session
Conflict Resolved