Added base user data
Merge and poop