[ui] merge fix, bump