Make format clearer with multiple merge conflicts
Merge pull request #4814 from dimagi/rebuildstaging

Make format clearer with multiple merge conflicts