fb authentication
fixed conflicts