Merge the conflict
[vuplus_openembedded] / opie-bartender / opie-bartender_1.1.7.oe