modify by linux
solve conflict