v1.4 resolve version conflict