[FIX] wrong conflict solving