Add tracking for resolved conflicts