sdoc gemfile change
fixing merge conflict