substitute, merge_lines, kill_line updated