[FIX] Merge conflict