add var to variable
fix conflicts