clean up after last merge