Removed blocksize hardcoding
fixed merge conflict