Resolved merge conflict by keeping HEAD version of .gitattributes 621b425 vaskui commited on Dec 25, 2023