resolved gemfile merge conflicts