fixed settings conflict