duplicate key error
fixed injection in user
after merge