readme re-org
fix merge conflic