Facebook authentication
delete extra stuff
Fix conflict