fixed delay issue
fix conflict
Fixed delay issue