Fix carrierwave to store locally in dev & test environments
Resolve merge conflict