Testing git conflict handling after adding .gitattributes file.