fixed broken merge
moving back to associates