Fixed improper merge conflict resolution to statepoint.rst