adds score increment
fixes merge conflict
adds user.save
fixes merge conflict