image model added
conflict in gemfile fixed