Display total sizes on folders
Merge conflicts