Bluetooth: Fix merge failures