commiting to pull
fixed merge issues
add on clickfunction