Merge the conflict
[vuplus_openembedded] / opie-button-settings / opie-button-settings_1.1.7.oe