_____ I had a fight with my friend, we are still good friends.

A、So that

B、As soon as

C、Until

D、Although