Corrected classname and added conflicts_with element