fixed version conflicts