Keep code style settings in sync
More line ending compatibility changes
I just don't know anymore