update social_login and update database migration
update code conflit and update social_login and migration