:octocat: Added .gitattributes
merge markers
Revert "merge markers"

This reverts commit 68d4009439c19db879169572e29beb6a09d6086c.