fix code canned statement
fix conflict