solved SQl Exception
Merge origin/master