How did you guys resolve merge or test conflicts? Did you just have to rebase, update your PR, and resubmit?