Added missing file tolerance to merge