Fix merge error.

Signed-off-by: C. Bouton <admin@cbouton.com>