fixed merge conflict on node details