* Fix broker merge