Updated File base class to merge from local when from_id