resolve conflicts by the least number of changes