Add resolve-adjacent-conflicts script
#2299
| Job | Run time |
|---|---|
| 3m 10s | |
| 3m 10s |
resolve-adjacent-conflicts script
#2299
| Job | Run time |
|---|---|
| 3m 10s | |
| 3m 10s |