Conflicts: meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb