We did have a quarrel about money last night, but now we have already _____.

A．taken up

B．made up

C．put up

D．brought up