File merge partially completed