2 new commits pushed to

<https://github.com/jmpsec/osctrl/tree/develop|develop>

by javuto

<https://github.com/jmpsec/osctrl/commit/6c4808355c6156646dc13d4c0801aaa78684df8c|6c480835>

- Fix conflict parameter in osctrl-cli

<https://github.com/jmpsec/osctrl/commit/a3d695570038266a9c62f3ba5ff4d9a95e87c8b1|a3d69557>

- Merge pull request #1087 from jmpsec/cli-conflict-platform jmpsec/osctrl