CarrierWave installed
fixed conflicts