Fixed.
I changed the history of log. Could you see it?
Changed again.
Add a new file.
Add gitaddtributes file.
Fixed conflict.