Changes userB made
Merge userB