Testing git conflict handling after modifying .gitattributes file.