Managing Clones Using Dynamic Change Tracking And Resolution