Check-in code merge