merge from hg
add for chmod