harmonize conflict in sbp.html