add mysql
Fix merge conflict