Merge fix

Last hit titan · build 18322044 · published

On SteamNotes only · this build shipped before we watched the app

Various merge interface corrections