fixing some merge problems
fixing some merge problems

massmutual/pystruct,wattlebird/pystruct,amueller/pystruct,massmutual/pystruct,pystruct/pystruct,wattlebird/pystruct,amueller/pystruct,d-mittal/pystruct,pystruct/pystruct,d-mittal/pystruct