fixed package json
conflict resolved