Competition and public law teams merge