Merge "Support 'conflicts:<change>' operator to find changes with same files"