The above command also applies the lwm2m_senml_cbor.patch patch file.
If the patch fails to apply, you can attempt to use the 3-way merge capabilities by committing the un-patched changes (i.e. up to and including the clang-format), and the running
```console
git am -3 < lwm2m_senml_cbor.patch
```
The patch was created by, committing the unpatched changes, then committing the desired patches in a subsequent commit, then creating the patch file with the command