Fixed that weird problem with conflicts