merge changes to Users repo
merged changes