Line ending normalization turned off
Solved conflict