add a function for dev version
add a function for dev on master branch
conflict fixed