Update directory.json
merged conflicts
Merge branch 'LXSkyhawk-patch-1'