gemfile and conflicts fixed