package json update
conflict resolved