sql
fixed merged conflicts