Fixed manage-user bugs
Fixed Conflicts