remove auto line wrap
merge