Attempt at resync

issues with lineendings