re #46 something went wrong during merge