fix sql
merge