FS-4321 --resolve
oops line endings