add go support
fix conflit