Small h2 and merge fix