Fix: merge conflicts