Clean conflicts after merging XOOPS Core master