fixed conflicts

4 jobs for GONRG-2933 in 29 seconds (queued for 2 seconds)