For the new bytecode enhancer, check issue HHH-9985 for the same use case. Merge won't fail, but changes don't get persisted.