fixed README conflict