removed version conflicts