add another conflict comment line