fixed conflicts in STII and IQP