How to use "けんかする" as an explanation for being upset (please see the details below)?
I would like to know how to properly use "けんかする" (quarrel) for a question such as the one below:
どうして緊張(きんちょう)しているんですか。
Which answer will be grammatically correct?
けんかしたんです。
or
けんかしていたんです。
Thanks in advance for all the help!

Question

Answer

Why are you nervous? 
Because I just had a quarell.

This sounds a bit unnatural?

I guess that maybe after a fight you will relieved or angry, but not nervous right?