Auto merge of #4636 - RochesterinNYC:add-merge-conflicts-quality-spec, r=segiddins
Auto merge of #4636 - RochesterinNYC:add-merge-conflicts-quality-spec, r=segiddins

Add quality check for unresolved merge conflicts

- Closes #4633

asutoshpalai/bundler,RochesterinNYC/bundler,dilumnavanjana/bundler,mvz/bundler,bundler/bundler,bundler/bundler,dilumnavanjana/bundler,asutoshpalai/bundler,mvz/bundler,RochesterinNYC/bundler