Best way to fix bad merge is just to generate again.