UserType Scaffold
resolve merge conflicts