ignore nohup.out
solve conflict