testing fog config
testing carrierwave production env
fixed merge conflict