add a conflict comment line