Andrew Averbeck

@mjahammel I don't believe that would work for our case since our macro has a couple inputs and when I tried to call it, it would tell me that the...

I tried resolving the conflicts, but it wouldn't let me commit the changes back. So I just copied my resolved code back to the branch. On the remaining conflicts, they...

If you'd prefer, I can re-fork my repository from the current repo, and then re-make my changes, and re-submit a new PR.