Merge "Add tracking for resolved conflicts"