Add fix merging a pull-request, now uses the new user model as well

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>