TSMC Interview Question

Q: How did you resolve merge conflicts in collaborative tasks?