to fix problem with merge