Fixes fight function error
Merge branch 'ploveTrials'