Update directory.json
merge conflicts
Merge branch 'amroto-patch-2'