update package json
merege with package json conflicts