chore: merge main and resolve worktree activity conflicts