whitespace/line-endings cleanup
indenting, and cleanup of missed merge markers