debug UI, sql conflict
fix conflict in sql