Fixed confirm value
Fix merge conflict