Modification sql
Merged conflicts resolved