resolves conflicts
updates gemfile