resolve conflict

5 jobs for GONRG-4668-refactor-variables-names in 29 seconds (queued for 3 seconds)