[InfoBarGenerics] fix merge