create item model/controller
fix merge conflict in Gemfile