fixed git merge artifacts in docs