resolve version conflict