fix version conflict