connect button to function
fix conflict