fixed user provileges
fixed conflict