fixed version conflict