c00e8c3 fixed the README conflict