remerging with older files