Remove conflicts symbols but keep both alternatives