[US208.2] make merging with copy/paste code easier