disable the button
added the cola
added new js
merge