Fix carrierwave error
merge merge merge