add carrierwave and image magic
resolve conflict