proper shutdown
line munge
merge
mergeunmunge
merge