The same problem GP was trying to avoid is created here, the merge conflict resolution being on the merge commit.
The same problem GP was trying to avoid is created here, the merge conflict resolution being on the merge commit.