Facebook login works
Fix merge conflict