Fixed gemfile merge conflicts