vic registereduserManager restoreOwnerItems
solved conflict in user manager
Merge branch 'vlawson3-master'