carrierwave 4
merge