stashing structure.py
fixed merge conflict in structure.py