Fix: merge error