cleaned up gemfile - had a gemfile.lock merge error