Actually resolve conflicts