trying to fix merge conflict
updated package json
fixing conflict