doc: fix build errors
fix merge conflict