text conflict
solve it by myself