Add a conflict line