chore: merge github/main, resolve conflicts (prefer ours)