Revent bad merge of Gemfile, and rebundle