Remove merge turds.
Break long lines.
Remove item that was rolled back (float formatting).
1 file changed