What is the main conflict in The Master Puppeteer by Katherine Paterson?

Jiro is a boy living in feudal Japan with his parents, who make puppets for the local puppet theater. Jiro apprentices himself to the theater so that his parents will have more to eat. He makes friends with the other apprentices, especially a boy called Kinshi. As time passes, Jiro begins to realize that Yoshida, the puppet master, is linked to the bandit Saburo. When Kinshi is determined to help the city's poor, whatever the cost, Jiro decides to appeal to Saburo. Unfortunately, he has misunderstood the situation, and it is actually the blind chanter Okada who is Saburo. Okada confronts him and he runs away. As riots break out in the city, Jiro tries to find Kinshi and his missing mother. He saves them and returns to the theater, where Okada decides to trust and accept him.