New line detection and flag control
New line detection and flag control
merge