working on duplicate handling
fixing conflicts
working on duplicate handling
fixing conflicts