force disable autocrlf - since that is what causes the mangling of files.
fixing autocrlf issues
merge