Merge Still Broken in RS5

It’s the same exact issue seen here, again over a year ago with the last status from @Revopoint-Jane that she’s looking into it…