Post-merge checkin