resolve conflict from previous merge in plasma.py
resoved all conflicts in plasma.py