clean up last merge