sql patches
fixed merge conflict