Cleared Merge Conflict Trail