Updated gemfile to handle conflicts and warnings