Fix merge conflict
Trying out a new gitattributes...