no changes
fixed conflicts
fixed everything about nodes