fixed earlier committed invalid merge