Finished Authentication
Conflict Resolution