Use working gitattributes

This will hopefully stop the bad merges.

    text=auto merge=union

is not a good idea.