integrate node chat into angular
fixed merge issue