Working on authentication
Fixed conflict
Working on user authentication