Fix mis-merged files.