clean after invalid merge