Fix: Merge conflict