adding GenericType
fixed conflicts