Fix SGPstateData merge conflict
Merge pull request #680 from adamvi/master

Fix SGPstateData merge conflict