lib: fix merge