files that appear changed after recovering from a corrupted tree
Cleanup
Removed zipped src
Fixed merge conflicts