ADDED CONFLICT: THE BEST CLASS EVER