Fix one file that wasn't merged correctly.