Corrected distribution upgrade for new format for files
resolve merge conflicts