moved mybatis file into resources
delete surplus file
fix conficts