fixed skip button issue
merge conflict