[noticket] Mending merge woes