Wipro Interview Question

How would you handle merge conflict.