NOTICKET: Fix merge issues caused by tool