[fx] fix merge