vic merge (conflicts)