Fix defgeneric syntax
Fix conflict