bors-servo

:broken_heart: Test failed - [status-taskcluster](https://community-tc.services.mozilla.com/tasks/groups/H6F6aLDYSjyanxDMZsOrSw)

:umbrella: The latest upstream changes (presumably #25674) made this pull request unmergeable. Please resolve the merge conflicts.

:lock: Merge conflict

:lock: Merge conflict

:umbrella: The latest upstream changes (presumably #28893) made this pull request unmergeable. Please resolve the merge conflicts.

:pushpin: Commit cc050fc has been approved by `jdm`

:hourglass: Testing commit cc050fc54ce3f16bc646d2b2bb6537f4de059851 with merge 3e55deded6fbb086bcb8a21ea7043865d0358da8...

:sunny: Test successful - [checks-github](https://github.com/servo/servo/runs/7872518019?check_suite_focus=true) Approved by: jdm Pushing 3e55deded6fbb086bcb8a21ea7043865d0358da8 to master...

:lock: Merge conflict

:hourglass: Trying commit e77e9d2bf7a20917f495f37d459dd77726661d24 with merge 995ad86730dbe90ade982217671c40ef862889f1...