PIM-1437 : Fix merging error