Update Structure scrip version.
Fix merge conflicts.