added nodes json config
fixed merge conflict in main