How did Huck resolve this conflict about borrowing food?

Huck decided to borrow food from the Widow Douglas by taking only what he needed and paying it back eventually. He felt guilty about stealing and wanted to make things right by repaying her. This resolved the conflict by showing Huck's honesty and willingness to make amends.