add proxy
fix conflict