doc cleanup
merge conflict