Conflict Resolve
after conflicts