[fix][porc][merge] Swapped the meaning of ours and theirs.

The meaning of ours now points to the head branch (the one we are merging from)
Theirs now points to the base branch (the one we are merging in)
aka, were the merge commit is made