removed function
fixed conflict