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