Hi, viewing this https://gerrit.wikimedia.org/r/#/q/status:open i am seeing some of my changes as merge conflict. But they couldn't be as i just rebased them. Going into the patch shows no merge conflict. So this looks like index inconsistency.
See the image below
Notice how "PHPSessionHandler: Workaround PHP5 bug" on branch REL1_28 shows a merge conflict on status:open page but shows no merge conflict on the actual patch.