Remove `merge=union` in .gitattributes example
Merge pull request #44 from andresmoschini/remove-merge-union-in-example

Remove `merge=union` in .gitattributes example