EMBRYO-196: merging now works correctly