spelled
fixed conflict