Merge the conflict
[vuplus_openembedded] / libopie / libopie2_1.1.7.oe