After arguing, "make up"