fixed gemfile conflict
fixed the user added product form