yeah, merge master, pick a value—doesn’t matter, then regenerate it and commit that.