PlaySlider Bug Fix
Fix Conflict between server and integration branch