.gitattributes change

.as merge=union