docs: remove deprecated X-Conflicts