Add file size info for files.
Solve merge conflict.