Fix of merge corruption that prevented compilation.