updated the h2 locally
fixed conflict