"this action" is a bit too generic for my taste. Could we attempt to look at the retryAction type and say something like "Unable to merge when changes..." and fall back to "perform this action" only if the retryAction isn't something we're expecting?