docs fixes
conflicts