remove sql
fix merge