solving readme conflict