merge bwo live changes