Merge error resolution
removed old dtos