changed units to bytes
fixed merge conflict