Prepping the changeover to the new merge UI