Working on confirm button
merge