change readme
fix conflits