[InfobarGenerics] fix merge