ditto on merge