1 2 3 4
--- title: Keep trailing newline when resolving conflicts by picking sides merge_request: author: