EB-6300 check-in missing sub flow entry after merge