Edit Auth Controller
Conflict