Fix bad file merge