confirm merge -s ours with user.
Merge branch 'pulp-2.3'