local changes
merge new text complete
cleanup