add conflicted file