added conflict line
conflicted line
merged with conflicting