GPII-162: Fixed merge error