avancement authentication
Resolve conflicts
Resolve conflict