Try adding git attributes to fix the README.md merge problem.