fix: merge error