I tried checking out wip-cite like so. git reset --hard release_9.4.5 git merge wip-cite git diff > conflict.diff I am seeing merge conflicts. See attached diff. Does wip-cite doesn't work with master or 9.4.5? Am I doing something wrong?