bad commit, on 2 files having different line endings