Reformat line to merge conflict for auto-merge
Shorten lines for auto-merge
Shorten lines for auto-merge