Fixed faulty Gemfile from merge.