facebook signup
fixed merge conflict