Fiserv interview question

How do you resolve conflicts while committing code?