[biblibre-newacq] fix some merge errors