started carrierwave
added carrierwave
fixed conflicts