[FIX CI] after conflicts fixes