worked on guardian redirection
replaced gemfile
resolved conflicts in Gemfile