Episode 9: Conflicts key point needs revision #629
In Episode 9: Conflicts the first key point at the end of the episode reads:
This isn't quite true. A conflict won't necessarily happen if two different lines are modified. It'll be triggered if the same line(s) of the same file(s) are changed. This key point in this episode should be revised to reflect this.