gemfile fixed, assets
conflict resolved