BRANCH 4.2:
  resolved a conflict in Search