lumber mill newline fix
fixing merge conflict