fixed imports in nodes
merging