Fix compilation error caused by merging conflicting Pull Requests.