docs: Fix merge conflict