Fix the output of the merge PR API endpoint when the PR conflicts
    
    Before this it was returning a 500 error code with HTML, while now it
    returns a 409 error code with our usual JSON payload.
    
    Fixes https://pagure.io/pagure/issue/3999
    
    Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>