Resolve version conflict