70792af
The prior merge resolved conflicts to the desktop/main (graft) side, which silently reverted lsdefine's recent upstream fix (inMixin check, ask_user schema, turn-25 prompt). Restore the 4 files to origin/main.
c85b59e
b365945
1eb8c4c