It was Uke who made all the effort for them to make up. It was quite a frustrating read in the novel. But yeah they were okay at the end.
