The merged core of last checkin had some issues