fix bad file merge