[FIX] solving conflicts correctly.