Base: fix merge