fix conflits readme