adding readdirRecursiveSync
merging
fixing conflict package.json
1.5.0