11 Months Ago
Regenerate manifest after merge rather than guessing merge conflicts