initial users
fixed merges