
            Resolve merge conflicts with Tino's changes to CliqzModuleData

0fdb21f