FORGE-1911: Added conflict check on DTO strategy