[COOK-3370] Fix broken hand-merging artifact