Add merge conflict line