merge conflict with infobridge