Adds Merge feature, and confirmation for buttons

Signed-off-by: Edmundo Perez <edmundo.perez@crowdint.com>