Authentication fixed, UserRepository finished
Conflict removed