merge baixing/wo