fix: merge conflict