I'm applying the changes Lukas proposed with regards to line endings tomorrow. This shouldn't have any impacts on merging changes, but just in case LET ME KNOW ASAP if you have a large amount of uncommitted changes and we'll hold off just in case.