Conflict line
Resolved conflict