Finish sign-in-out
Conflict resolution