Added facebook login to the system
Conflict in logins resolved
resolved conflict