remove mismerges from upstream sync with 4.9.0