Remove README conflict text