fix: USE THEIRS for AU conflict and USE MINE for UA conflict
#2968
| Job | Run time |
|---|---|
| 3s | |
| 4m 0s | |
| 2m 44s | |
| 2m 18s | |
| 3m 34s | |
| 3m 51s | |
| 2m 51s | |
| 17s | |
| 17s | |
| 58s | |
| 53s | |
| 23s | |
| 26s | |
| 22m 35s |