/test-gitattributes

Testing whether github respects `merge=union`

test-gitattributes