fixed conflict member name