mavi code merge