Fixed merge files.