Fix compilation after a bad merge