Last minute merge