ODI/Test button UI fixed
conflict resolved