fix some merge resolution bugs #4613
| Job | Run time |
|---|---|
| 5m 45s | |
| 6m 47s | |
| 3m 56s | |
| 1m 17s | |
| 1m 23s | |
| 1m 20s | |
| 5m 6s | |
| 5m 9s | |
| 4m 42s | |
| 5m 8s | |
| 5m 39s | |
| 4m 36s | |
| 5m 2s | |
| 5m 6s | |
| 5m 9s | |
| 4m 59s | |
| 4m 51s | |
| 5m 18s | |
| 4m 58s | |
| 5m 0s | |
| 5m 4s | |
| 5m 27s | |
| 5m 10s | |
| 5m 15s | |
| 5m 1s | |
| 5m 6s | |
| 5m 27s | |
| 5m 11s | |
| 5m 13s | |
| 5m 16s | |
| 4m 29s | |
| 4m 51s | |
| 5m 2s | |
| 8m 42s | |
| 5m 18s | |
| 2h 51m 43s |