Fix SGPstateData merge conflict