Merge: Fix --no-union-attributes