SrvPalette.c: missed a merge conflict in SrvPalette.c