how to resolve conflict worksheet - Search