Fix merge conflicts for timeShift controls