line endings from merge from 5.2.1