Merge and update search conflicts
Merge and update data mining