resolving README conflict