Consolidated merge and difference