user class hydrate
fix conflict
fix conflict