Sending large files now shouldnt cause Java Heap space error.
Conflict resolved.