fixed discovery after merge issues