really resolve conflicts