Edit readme
fix conflic