Updated readme re conflict update