merge tbotalla