create a conflict line