Added user seeds
Conflicts resolved - white space issues