Merge the conflict
[vuplus_openembedded] / opie-style-flat / opie-style-flat_1.1.7.oe