resolve conflicts - process for Windows ok