Merge the conflict
[vuplus_openembedded] / opie-deco-polished / opie-deco-polished_1.1.7.oe