Insert a line that will clash.
Resolve a merge.
Stuff