Conflicts never nice to deal with - especially not with a loved one. Your dad probably feels bad too.
I don't know why you were fighting but I think if you want to try and resolve things then first things first is to pour the drink away. It's not going to help you. It will only increase your stress levels, your judgement, patience, everything that you are going to need to sort things out with your dad.