switched to dos lineendings to be able to merge