Merge the conflict
[vuplus_openembedded] / opie-appearance / opie-appearance_1.1.7.oe