Fixes small errors in merge files.