fixed npm issue
Merge Conflict