changed possible varible conflict's