My point is the time to avoid merge conflicts is before anyone writes any code. "You're working in File A today? OK, I'll pick up something different from the board than what I was assigned so we don't get conflicts."