fixed strange undef variable causing settings merge conflict