Test conflicts file resolve