How to answer what you did to resolve a conflict?

My life as a programmer - A podcast by Fredrik Christenson