I discuss the possible pros and cons of all the possible solutions with the person I have a conflict with. I would brainstorm these solutions and try to come a single solution which will benefit the company and add value to the process.