added conflict text line