Learn Hardcore Japanese: nakanaorisuru - to make up; to reconcile