updated users table
Changed gemfile and gemfile.lock
Resolving merge conflict issues
Got google auth login