[FIX] multiline block parse
[FIX] spurious whitespace when saving unchanged blocks
[FEATURE] from @gertz f8974225
[FEATURE] merge behavior tests
[REMOVE] @extension 0a41360f7 from this branch (see 629a5cc3)