Use “Wollen wir uns wieder vertragen?” for “Shall we make up.” A gentle suggestion after an argument.