Resolve merge conflict in README.md and keep improved onboarding version