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

OpenTreeOfLife/phylesystem-api,OpenTreeOfLife/phylesystem-api,OpenTreeOfLife/phylesystem-api