fixed merge in orderparameter.py