Class conflict resolved