fix mergeconflict - npm install