think I got this line ending thing licked
merge