Attempt to abort a failed merge in pull controller and return a 409 as suggested by @jar398