gemfile
gemfile conflict
fixed facebook login