Fix errors
Merge branch 'master' of https://github.com/medo/RDBMS-T2
fix conflict