previous definition after update to btstack develop

Hi, I need to use btstack develop as they are fixing issues with -O2 optimization but I get the following error if I update it in the template:

In file included from ../components/bluepad32/uni_bluetooth.c:72:
../components/bluepad32/include/uni_hci_cmd.h:27:5: error: redeclaration of enumerator 'HCI_OPCODE_HCI_PERIODIC_INQUIRY_MODE'
     HCI_OPCODE_HCI_PERIODIC_INQUIRY_MODE = HCI_OPCODE(OGF_LINK_CONTROL, 0x03),
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../components/btstack/src/hci.h:52,
                 from ../components/btstack/src/ble/gatt_client.h:46,
                 from ../components/btstack/src/btstack_event.h:57,
                 from ../components/btstack/src/btstack.h:61,
                 from ../components/bluepad32/include/uni_hid_device.h:22,
                 from ../components/bluepad32/include/uni_bluetooth.h:28,
                 from ../components/bluepad32/uni_bluetooth.c:55:
../components/btstack/src/hci_cmd.h:93:5: note: previous definition of 'HCI_OPCODE_HCI_PERIODIC_INQUIRY_MODE' was here
     HCI_OPCODE_HCI_PERIODIC_INQUIRY_MODE = HCI_OPCODE(OGF_LINK_CONTROL, 0x03),
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../components/bluepad32/uni_bluetooth.c:72:
../components/bluepad32/include/uni_hci_cmd.h:28:5: error: redeclaration of enumerator 'HCI_OPCODE_HCI_EXIT_PERIODIC_INQUIRY_MODE'
     HCI_OPCODE_HCI_EXIT_PERIODIC_INQUIRY_MODE = HCI_OPCODE(OGF_LINK_CONTROL, 0x04),
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ../components/btstack/src/hci.h:52,
                 from ../components/btstack/src/ble/gatt_client.h:46,
                 from ../components/btstack/src/btstack_event.h:57,
                 from ../components/btstack/src/btstack.h:61,
                 from ../components/bluepad32/include/uni_hid_device.h:22,
                 from ../components/bluepad32/include/uni_bluetooth.h:28,
                 from ../components/bluepad32/uni_bluetooth.c:55:
../components/btstack/src/hci_cmd.h:94:5: note: previous definition of 'HCI_OPCODE_HCI_EXIT_PERIODIC_INQUIRY_MODE' was here
     HCI_OPCODE_HCI_EXIT_PERIODIC_INQUIRY_MODE = HCI_OPCODE(OGF_LINK_CONTROL, 0x04),
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~