Conflicts in .coveragerc and requirements_all.txt

I have currently 2 pulls , but the one of them have conflicts in .coveragerc (https://github.com/home-assistant/home-assistant/pull/21658) and the other one have conflicts in .coveragerc and requirements_all.txt (https://github.com/home-assistant/home-assistant/pull/21704)

What does this mean?
I haven’t seen this before.

Never mind. A catchup and force push seems to have resolved this.