add the personal info
resolve the conflict
roll back the user.java