fixed node bug issues
fixed merging