Fixed readme conflict