fixed merge issue and removed node 0.6