update readme re: wiki
fix merge conflict