tidyup of last merge