Add auto convert line ending to
Add contributor
resolve conflict