resolve conflict on getAllUser