resolved version conflicts