conflict on submod bbrec solved