adapt merge to new trycatch