Fix: merge conflict