Merck interview question

Conflict Resolution with a peer - How did you resolve?