Added user types
Merge solved
Added and solved merge conflicts