Update sites.json
fixed conflict and tidied up sites.json
Merge branch 'ressalex-patch-1'