Actually resolve conflicts.