update sql
fix conflict