Fixed gemfile after merge conflicts