fix messy merge resolution

Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>