Fix Click.click
Fix Merge