CDB-2077 bad merge fix