Merge local changes #2
Description
The copy of the tool on my machine has diverged from what's in the repository and needs to be merged.
{{ message }}
The copy of the tool on my machine has diverged from what's in the repository and needs to be merged.