make up(仲直りする): They had an argument but made up later. (彼らは口論しましたが、後で仲直りしました)

They had an argument but made up later.