fix detecting a merge is needed.
Merge branch 'pulp-2.3'