Fixing merge, part 2

And of course updating my Git version causes all the line endings to explode -.-