Changed FileData to use the filesystem to cache file parts.  File parts are no longer all cached in RAM.  Untested.
Handling merge conflict.  Debugging message was added locally where code was changed on Master.