Display UnsolveOrderConflict correctly in diff --short

Created by  sellout  on September 26, 2022
X6TM3HVPIMUVPIFLUQWNND6ZKDHT52LONNBRLFJ2VUQNCUAHXSDAC
Change contents