add more users
fix merge conflict in seed file