Breeze: fix merge conflict