bug fixed
solve conflict