table layout fix
fix conflict