fix pause
merge