improves comments documenting baseline merge ux
adds hack to accomodate CAP-1602