changes to sql
merges