russian config conflicts fix

so now there shouldnt be any more conflicts