clearing merge lefovers that got committed