post help
Changed gemfile lock conflict