merge bert changes