[USER] Unfortunately this issue is really only apparently when we actually went to perform the next merge, we will be changing how our infrastructure tooling is generated and consumed so in the future this isn't even a concern, but that is a couple weeks away likely.