DE21067: Fixed merge conflict.