It's due to the conflict in plainbox-provider-plano/units/common.pxu. You can get a diff by fixing that conflict.
It's due to the conflict in plainbox- provider- plano/units/ common. pxu. You can get a diff by fixing that conflict.