Fix conflicts caused by MappingsMerger
#2285
| Job | Run time |
|---|---|
| 4m 17s | |
| 2m 48s | |
| 0s | |
| 0s | |
| 0s | |
| 0s | |
| 7m 5s |
MappingsMerger
#2285
| Job | Run time |
|---|---|
| 4m 17s | |
| 2m 48s | |
| 0s | |
| 0s | |
| 0s | |
| 0s | |
| 7m 5s |