The two remotes had drifted: GitHub carried a papers sleuth index and a copy of the macOS oskiewar app commit that also tracked the three nopaint files, while the knot carried eleven commits of oskiewar work. Neither side was redundant. The nopaint files were byte-identical to the ones sitting untracked here, so adopting GitHub's tracked copies loses nothing. # Conflicts: # papers/cli.mjs # xbox/live/hello.js # xbox/live/mac-test.html # xbox/live/social/manifest.json # xbox/live/social/oskiewar-title.jpg # xbox/live/social/oskiewar-title.mp4 # xbox/live/tests/hello.test.mjs # xbox/macos-native/main.swift