fix merge of tar race