rename vars as conflict