fixed button functionality
fixed merge issues