cherry-pick/revert: add scissors line on merge conflict