clean-up:  merge text from a non-scm'ed copy