fix merge typo

Signed-off-by: Frederic -lefred- Descamps <lefred@percona.com>