fix merge

Signed-off-by: Tomas Neme <lacrymology@gmail.com>