resume button fixed
merge