[DEV-1740] Resolve leftover merge conflict.