To resolve a conflict with a colleague, I would address the issue/s directly and respectfully with my colleague. I would schedule a private meeting where we could both express our viewpoints calmly. My goal is to find common grounds and work together to find a solution that benefits both of us. Only if needed, I would seek input from my manager or mediator to ensure resolution. I believe clear communication, empathy and focus on shared goals are key to resolving conflicts effectively.