delete the line in linux
conflict fixed