chore(build): ignore merge conflicts in dist folder

Add missing .gitattributes to work correctly with the entry in .git/config
that we automatically create with the grunt install command.
chore(build): test ignore conflicts in dist
chore(build): create a current build
Merge branch 'test'