fixed issue with permissions during directory bootstrap
fixed merge issue