ignore cdargsresult
ignore cdargsresult
fixed gitignore conflict