Refactor #find_matching_line
Implement #find_merge_target
Add merge_if_possible()
Fix find_line()
Minor refactoring
Merge branch 'merge_postponed_subsection'