Update .gitattributes
conflict test