#33 Wrote the authentication
#33 Solved the confilct