changes to sql
12
merge