halo resolve conflicts