normalised line-endings
saved .gitattributes
merge lineendings