vic registereduserManager restoreOwnerItems
solved conflict in user manager
Merge branch 'vlawson3-master'
Merge pull request #18 from jrec15/master

solved conflice in user manager