Correct the merge conflicts between team members

Colin was working on the limiter at a similar time as James. The end
result had neither of there work. I merged all there conflicts slider is
working as desired.