Change 'mergeEq' to use 'emit' for conflicts