Validate struct versions in merge, revert

Validate that structure version.