fix merge conflicts
fix merge conflicts
add code for column discount in storageClient